From: Jim Blandy <jimb@redhat.com>
Date: Sat, 19 Jun 1993 21:01:38 +0000 (+0000)
Subject: * xterm.c (XTread_socket): Never treat a modifier key as a
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95221
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=64a072198028d6394000f7a9edec306aa23812b8;p=emacs.git

* xterm.c (XTread_socket): Never treat a modifier key as a
	non_ascii_keystroke.
---

diff --git a/src/xterm.c b/src/xterm.c
index 8dd20f542c5..f64b2fa83de 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2893,22 +2893,22 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 
 	      if (numchars > 1)
 		{
-		  if ((keysym >= XK_BackSpace && keysym <= XK_Escape)
-		      || keysym == XK_Delete
-		      || IsCursorKey (keysym)       /* 0xff50 <= x < 0xff60 */
-		      || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */
+		  if (((keysym >= XK_BackSpace && keysym <= XK_Escape)
+		       || keysym == XK_Delete
+		       || IsCursorKey (keysym) /* 0xff50 <= x < 0xff60 */
+		       || IsMiscFunctionKey (keysym) /* 0xff60 <= x < VARIES */
 #ifdef HPUX
-		      /* This recognizes the "extended function keys".
-			 It seems there's no cleaner way.
-			 Test IsModifierKey to avoid handling mode_switch
-			 incorrectly.  */
-		      || (!IsModifierKey (orig_keysym)
-			  && (unsigned) (keysym) >= XK_Select
-			  && (unsigned)(keysym) < XK_KP_Space)
+		       /* This recognizes the "extended function keys".
+			  It seems there's no cleaner way.
+			  Test IsModifierKey to avoid handling mode_switch
+			  incorrectly.  */
+		       || ((unsigned) (keysym) >= XK_Select
+			   && (unsigned)(keysym) < XK_KP_Space)
 #endif
-		      || IsKeypadKey (keysym)       /* 0xff80 <= x < 0xffbe */
-		      || IsFunctionKey (keysym)     /* 0xffbe <= x < 0xffe1 */
-		      || x_is_vendor_fkey (orig_keysym)) /* wherever */
+		       || IsKeypadKey (keysym) /* 0xff80 <= x < 0xffbe */
+		       || IsFunctionKey (keysym) /* 0xffbe <= x < 0xffe1 */
+		       || x_is_vendor_fkey (orig_keysym))
+		      && ! IsModifierKey (orig_keysym)) /* wherever */
 		    {
 		      if (temp_index == sizeof temp_buffer / sizeof (short))
 			temp_index = 0;